Start automerge check again after the conflict check and the schedule #34989
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GiteaBot
added
the
lgtm/need 2
wxiaoguang
added
backport/v1.24
lunny
approved these changes
Jul 7, 2025
GiteaBot
added
lgtm/need 1
Co-authored-by: posativ
wxiaoguang
changed the title
hiifong
approved these changes
Jul 8, 2025
GiteaBot
added
lgtm/done
lunny
pushed a commit
to lunny/gitea
that referenced
this pull request
Jul 8, 2025
…go-gitea#34989) Fix go-gitea#34988 Co-authored-by: posativ
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Jul 9, 2025
* giteaofficial/main: Refactor mail template and support preview (go-gitea#34990) [skip ci] Updated translations via Crowdin Fix bug when displaying git user avatar in commits list (go-gitea#35003) Tweak placement of diff file menu (go-gitea#34999) Start automerge check again after the conflict check and the schedule (go-gitea#34989) Refactor time tracker UI (go-gitea#34983) [skip ci] Updated translations via Crowdin Improve NuGet API Parity (go-gitea#21291) (go-gitea#34940)
wxiaoguang
added a commit
that referenced
this pull request
Jul 10, 2025
…#35002) Fix #34988 Backport #34989 Co-authored-by: posativ Co-authored-by: wxiaoguang <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #34988
Co-authored-by: posativ